From 46bcfa0098132d7dbbc3cdc4e4091efa8a02e558 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Thu, 17 Jul 2014 16:48:34 -0400 Subject: [PATCH] gdkwindow-wayland: Take out the margins for now xdg-shell has moved on and replaced set_margin with set_window_geometry. To properly support set_window_geometry requires a full rewrite of how we've been dealing with toplevel windows for now, so just don't set any margin until we can have a proper toplevel window abstraction in GTK+. --- gdk/wayland/gdkwindow-wayland.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/gdk/wayland/gdkwindow-wayland.c b/gdk/wayland/gdkwindow-wayland.c index 5782474112..41e6fb1b10 100644 --- a/gdk/wayland/gdkwindow-wayland.c +++ b/gdk/wayland/gdkwindow-wayland.c @@ -678,11 +678,19 @@ gdk_wayland_window_sync_margin (GdkWindow *window) if (!impl->xdg_surface) return; + /* XXX: xdg_surface now has xdg_surface_set_window_geometry. + * + * We need to have a GdkToplevel or some other class in order + * to make this work correctly. For now, don't do anything with + * the shadow widths. + */ +#if 0 xdg_surface_set_margin (impl->xdg_surface, impl->margin_left, impl->margin_right, impl->margin_top, impl->margin_bottom); +#endif } static struct wl_region * -- 2.30.2